Added support for guids