Add generic tag support to not be limited by standard HTML tag