Add AcademyTasks and MessagesInBottle