Added a based resolver to Entity