Added goals and tasks