Add support for data between tags