Fix
Update mappings
Merge pull request #7 from inspiran/master

Update ODM mappings