configuration refactoring completion
beta 11