Update to work with any user