Updated ability to display Data Set