Added better support for Tags
Added better support for Tags