Removed the client. We don't need it any more
Added the uid to the constructor and fixed the links in the table