Updated architecture.