Added support for dynamic columns.