Variant undefined fix
Start of proposal tool generation