refactoring builder-manager coms