Added some Javadocs