ImageContainer improvments, impl moved