Some changes for API chapter