Add unmarshaller support.
Facepalm.