Implemented latest CommandExecutorBase
Formatted Code