Updated for latest CMF changes