added experimental support for custom tags

small changes to allow for experimenting with custom tags