Fixed Generate function to accept additional argument
Deleted old Generator file