Command Handler map refactoring