Updated oimb mappings