Refactoring for new web server version