Change architecture a bit.