More updates on the doc