Updated feature: Some config improvements