Adding UID logic to client