Added hdp2 support
Added CDH3 support