Added better TAGS generation