Added more java doc