Refactor for ImageInterface classes