Added persistent stores (currently untested)