UNSTABLE: hitDetails refactoring, data storage refactoring