Added JavaDoc + Complete constants