Splitting out config for ease. Further tweaks