Updated defaults and structures