Persistence enhancements