Added support for Tag Libraries