Add support for tags
Add convertion to UTF-8