Completing cms functionality