Major fixes to the way the plugin called CMSMS API.