Upgraded independent ZF components, not finished yet