Initial support for OEM images