Tags Containers improvement