fix for persistence, improved initialization of org and domains