Please ad javadocs and may be final ?