Add a matchOneOrNull method