renamed misleading attr 'fields' to 'non_rel_fields'