Added CDH5 support