Fix interpolation
Improve generation, node support testing