Small updates to model