Updated/New Composer support for Image_Canvas

See diff for full changes