Add Uuid support