Update implementation of EntityCollectionValueResolver