Add net40 support