Added support for registry images