Added map to map decoder