add support for tasks