Change architecture a bit