Moving to improved OO model