Manager and Persistor changes
Trying to recover formatting defaults
negligible changes