Added TagAPI support