Added proper tasks mapping