Renamed container to resolver