Added support for image references