Refactoring PersistentObject and other things, new sources in sleep.