Changed wrap mode for generated code
Fixed import list