Fix #78

Switch to UUID system