Added changes from cms instance