Added support for upcoming sections