changed server/client storage into associative arrays