Switch to OO implementation