Update to envinject-lib 1.16