Added support for markup row