Some changes to models