Incorpore correct indicator data and put all data in config files