Add more ZF2 compatibility