Add support for start and end tags