Changes to reflect new way UID is generated on server