PIDStore: refactoring initial release