TagsInfrastructure improvements