Making database presence optional