Added hdp2 support