Improving A Headless CMS