Added find and findOr functionality