Added support for multiple rows