Added support for inserting tags