Added table selection.
Commented duplicated symbol.
Renamed some type names.