Tag infrastructure improvement