Refactoring for new appserver version