Better command handling system
Better command handling system