Modifying the task to have a client and a runner option