Add config options
Update config property config -> configuration
Merge out