added some db support