Attempting to add javadoc compatibility