Added todo
Updated generated class javadocs