Move initialisation to Task