Mako optimizations