Change userId and deviceId to userGuid and deviceGuid