Renamed to InputResolver