Use mapping api instead of accessing data directly.
Merge pull request #18 from 4teamwork/deif-use-mapping-api

Use mapping api instead of accessing data directly.