Refactoring for Zikula 1.3.x