updated client to use roles, role models