ZF-Core refactoring
ZF-Core refactoring