Architectural changes. VBP now overrides system defaults.