Adding randomUUID strategy