changes made according to cerf api change.