Adding database support