Update to allow group and user changes