Refactor EntityResolver
Refactor EntityResolver
Merge pull request #11 from PedroTroller/fix/refactoring

Fix/refactoring