Slimmed down package
Added tagname info
Added tags map