Added more JavaDoc headers