Refactor SQL data type class hierarchy
Refactor type class hierarchy