Add support for additional mako combinations