Additional support on jdbc and csvjdbc. Starting code clean up.