Major changes to server/Using UUID