Controller.py added and improve model datastore