Added all checks for tables