Add ViewModel and MsTools