Resolves unmarshalling bug and adds appropriate annotation to the fieldtype enum. (OOOPS. Should have caught that earlier)