Recreate sql types #707