Added support for image handles