Changes to remove javadoc generation warning