Changed Dson structs to classes.