Refactor EntityResolver*
Merge pull request #7 from PedroTroller/fix/refactoring

Refactor EntityResolver*