Update for UUID and fix packaging