Add StartupTask, reorganising using