made changes to schema to use explicit fields enum that is available for expression parsing as well