Add ZF2 and some logic