Merge "Update Architecture section"