added database support infrastructure