More doxygen comments