Adding atom config
Merged