Map the keys correctly.
Merge pull request #4 from jordandukart/7.x

Map the keys correctly.