Update block usage to use UUIDs