Added proper uuid generation