Added support for better documentation