Refactoring: remove HitID and organized the sessionID