Added support for artibtrary tags and autotagging