Updated doxygen handling