Changes to support tags and full export