Add more javadocs