Minor preconfiguration and architectural changes