Added support for multiple comment sections