Task controller enhanced