Add Unmarshaler interface