Make database optional

Cool, ++