DataViewer refuctoring is completed