Added support for Doxygen and modified database handle