Add javadoc and some content