Adding correct annotation for uuid management