Adapted to new image manager