Move ImageContainer out of Pump Objects

[ci skip]