Dynamic tag names

Improved support for dynamic tag names including Id generation.