Updated TagAPI