Adding more javadocs