Update JavaDoc
Add more documentation