Add row support and extra data.