Updated with doxygen commands