Add support for mako and hammerhead