adding tag infrastructure