Reworked tasks into containers