added tableName support