Moving to improved OO model
Moving to improved OO model