Updated data (NA189)
Fixed compatibility (NA189)