Add support to Hammerhead