repo fix + added UUID use