Refactored the method used to convert various setting details into a Dataset so as to grou