Rework API section.