Update validation query
Update JavaDoc comments