Update to wrapper class