Moved commands to separate executor