Updated model class