Added ability to add data attributes to tags
Fixed exception message