Add goals and sandwich plugins