Finished validation for types
Added validation for contexts
Separated Match - multi-value match, and Branch - single value match