general improvements on persistence