Further refactoring of configuration