Major changes and enhancements, now compatibile with CMSMS 1.11.x