Updates to 'model' class