Add AWS support for images