Completed conversion to Guids