wip configuration managment refactoring