Refactored params
First batch of config params
Another batch of params for oned.conf