Some improvements on configuration
3 files changed