Added support for guid tag