Updated client/server abstractions to be less stupid