Forgot to switch these to use UUIDs