Tweaked tag creation to include message.