Images mapping

Change-Id: I2833bbd5b479d77f0c95d248b974a794bdf2ee22