Changing OO interface to fit new reality.