Replace primitive types with wrapper classes on domain objects