impove the cmgo api