Updated for CDH4.4
Updated for CDH4.4