Change client to bring back server objects instead of hashes