Added and expanded JavaDoc