Made sure proto marshaller knows it can marshall these other types as
well