Add uuid everywhere