Added ViewModel classes based on DB design