Moved backend changes to plugin cf_backend