better viewmodel, odata integration