Added compatibility for JavaDoc generation