Refactor for new servlet container servlet module