Implemented API changes in Command System