Improve complete configuration