Update optional config files architecture
Update config files