Updated to include support for short guids Sguid