updated view models and should return correct json format