Updated Javadoc
#newsmute-60 In Progress