Added implementation of persistent buffer