Updated infrastructure to add tag feature.