Added more javadocs comments