Changed primitive types to wrappers