inproved default persistence
inproved default persistence