Reinout jdbc improvements