Adding support for net40 and net45