Make database service provider more flexible