Updated to moved NS.java and removed dm2e-ws dependency