Some changes in model and settings