With modificationf for Doxygen