More work on the GUID implementation