Rework to run off apache datasets