Modified tagging configuration