Changed Types to wrappers