Added CDH3 support