Fixed command api