Adjusted ODM mappings
Additional ODM mapping adjustments
Merge pull request #11 from inspiran/refactor

ODM mappings