Add uuid support