Add the UUID on every way