MVC/WebApi upgrade