More changes to support UUID's