Add support for custom tags