Updates for Images API changes