Updated commands to latest command format