Rdbms hystrix changes

Fix #48 #40