Summary: Updates for API and comments to sync with Shengwen