Changes to engine.ns.io package and make