Added autotagging functionality