Added handling table rows