Model: more object-oriented data handling