Added class definitions to JavaDoc comments