New state architecture