Updates to support xCMS