Improved javadocs