Small refactoring of ConfigurationImpl