Some parts were still using ZF1 methods