Entity class resolving fix