Added support for dataset tags
Added support for dataset tags (+tests)