Added support for creating row callback