Buildout setting refactoring