Some generator bugs fixed.
Importeds added to generator