Refactoring servlet engine to new descriptors