Implement CM5 and CDH5 support