Switch toggle persistence to use UUIDs