Issue #332 Specified the table names