Editing: IdentityMarshaller.php