Optimisation : Some models are singleton now, and controller modified to use it.