added cwp path suppport