Refactoring. Add points history and market.