Added support for Guids.