CRAFTERCMS-368: Supporting the new design. It still requires more testing