Changes in model and controller