Linked most ViewModels from 8.0 to 8.1