More updates to site architecture