Added Service/ViewModel