Changes for testing of DataSet mapping and inheritance settings for mapping