Improve support to historical data and update config values