Minor update on Master Data ViewModel