Config improvement