Refactoring ebcore