More model and controller