Add ViewModel and packages