Support changes to how images are stored