Add support for HDP, too