bringing some web client models inline with server models