#661 - Refactored the GUID logic.