Add generic tag support
Add example tag YAML files