Added OO-model