Added support for rowId in sponate mappings