Refactoring: All remaining commands into new execution architecture