TasksFactory updated