Added in a couple of sql types, dropped bothering with distinguishing subtypes