Restructred how facets are included in schema and added new facets