Renamed $unwind to $expand