Fixed oneOf matching
Added schema
Added enums and schema validation