added table suffix support