Added userId too