reworked saving on dataSets, removed traits to make 5.3 compatible