Few more changes to the new Model API on the client.