(partially) solved a number of issues, refactored OMS mappings