Make TaskService ready for the future.
Updated client task service.