Refactored AR find