Update new callback implementations and improved Doxygen comments