Add better-defaults to replace a lot of exist code