datasets module: enhancements

enhancements