Got rid of UUID generator