Partial changes for removing cfs_fields table