@emir-hasanbegovic did more work with tasks and added TaskService