Added table name constants and table switching