Get rid of uuid dependency