Improved Mako support.  Needs Mako tip