Added user id to goals