Add tweaker classes, more utils