Add goals and users