Updated for userId