Fix table column names
Improve wrapper determinator algorithm