Added support for Doxygen and modified database handler