Updated to use a UUID