added support for custom tags