Made most of the asDto methods and fixed incorrect field in SampleDto