Updated architecture