Added uuid support