Tagging: The tags are now added as Tags and XTags.