refactor: using new CommanderTrait