Added CDH4 support