Improved non-linear devices for quantum applications. (28th June 2021)