Feature/entity resolvers