updated persist and moved modelmanager