Updates for security and CMS