Added fields and getter/setter methods to model classes.