Added wrappers to fields