Update function generated
Override all and where function to add correct return types on phpdoc