Changed And and Or to types

This will allow attaching UnmarshalJSON methods