Use hydrator map
Merge pull request #69 from rstgroup/feature/plugin-gethydrator-optimalizations

Use hydrator map
Merge branch 'hotfix/69'

Close #69