Added support for UUIDs (Requires updater)