FinancialMarketModel and HistogramGenerator modification