Added java doc comments