Updated
architecture layout