Some more attributes for config object
Hope to fix merge conflict on config object