#20 : Add control on UUID field