Implemented improved command system