Update facets to new field names, change schema methods into class methods