modfied the ids to be uuid