Update core framework to better handle requests