Refactor in config files/Add active support