Made some fields optional in demarshaller