Refactored DKTuner