Refactored the FindAsync method