Add support for running single task