Actually use UUIDs for checking (oops!)