Improve Config, and integrate it