Develop

Updated CSW Adapter.