Made compatible with new cfA