Image and API usage updates

Image and API usage updates