Separate Tags from Attributes and rename kind tag (close #75)