Add Javadoc back in