Support CDH4.5 and CDH 4.6