Few Changes and Added Java Doc info