updating to add userId and siteId/groupId