Updated to new version 1.1, better tracing in generator