refactoring for zikula 1.3