updated to support images and containers