Updated trace classes to use dataset interfaces