Included ignored fields in the wrappers for better marshalling