Added some tag capabilities