Sen jdbc

Merge updated code for Travis test to pass