Architecture tweak.