Added more doxygen comments