Added TODOs to Modified Generator