ZF-Core refactoring