Method "findEntity(...)" refactored