Added support for image steps