Fixed #94, Added TODO comments on Generated code