[JDD 07.25.2013] Updates in model and controller