Making the configuration better