ZF components refactoring in process