Updated findWhere method