Reworks container handlers