Changed the way API commands work