Adding better-defaults