More efficient OMC yield handling + NEI yield look up