Integrated changes on config style