Changes to support multiuser API calls