Updated for CDH4.4