Revert to command and operators to just enums
Extract input maps to separate class