Added model and controller