A bit more doxygen