Add support for hammerhead