Javadocs and return type changes