Making the defaults a lot more logical and semantic