Add support for row template