Refactored and provided complete and clean integration for ZF1