Updated defaults and generator