Add sections to v18. Fixes #16