Renamed Current to CurrentEntry