Refactor of config information