Fix config structure