Configuration improvements
development
refactoring
Development