Design Changes to Model Class