Model class and other adjustments