Add support for HOTs