Add proper unmarshallers.