Updated to use newer TagAPI 3.0