Adding findFirstOrNull