Added CMS6 support