Update clientmap
Update server to work with admin and user access