Add tags to the public API
Add tags to the public API