Various changes to overall architecture.