Switch to explicit dataset loading. Issue #126.