Upgraded to meet cakephp3 requirements