Added support for color and image