Minor adjustments to the model
Updated Controller to support model persistence