Rewriten API chapter with new changes