Added simple database support