Enhance process to maintain Master Data : refs #326 #328 #333