Added support for nested rows