Changes to support faster response time from server.