feat(catchAll): changed catchAll signature