improve persistence mechanism