Refactored command handler elements
Merged changes