Updated to Mako 4.2 structure