Added definition tagging