Updated to use external nitro.gen