Added tag capabilities
Added tag capabilities