Added support for tiered tag system
Converted tags to use _tag attribute