updated some view models on core side