Altered command handling and creation command