Added support for controlling includes and multi-column layouts