Fix Tuner framework to be OO