Updated to use findWhere instead of pluck