Added tag framework