Can you add a small class javadoc and @Override annotations to all implementation methods?