Added PStore storage backend + minor bug fix