Added userId to comments