Refined CMS methods for main lib too