More sensible design for example CMS