Adding code for using tags for tables