Included ignored fields in the wrappers for better marshalling

The class should be internal so there is no need to change field visibility.