Updated to work with Doxygen