E9App refactoring