Updated to use dataset interface, removed unused imports