Make the model more object oriented.