No longer loading the UUID class unnecessarily