Added solution model and controller