Refactor CMS interface to use generic requests.