Added support for new ImageServer