Updates from latest doc