added ping store and refactored common code