Added tagging ability to logging code