Preferred P&ID Software Suggestions

I am working in the environmental field and mapping processes for Leak Detection and Repair (LDAR). I need to create P&IDs for our process to number the components to be inspected and managed under the environmental regulations. Any suggestions on what software to use? FYI - The plant engineers have AutoCAD. I have years of experience with AutoCAD/Visio and a Mechanical Engineering background.


In case the client does NOT have preferred software, here are some suggestions:

I have used VISIO for drawing pilot plant P&IDs. EDraw is better than VISIO according to the grapevine. When I have to do editing of existing P&IDs, usually in .DRW file types, I use a program called GRAPHITE from Ashlar-Vellum. It is similar to AutoCAD.

Above is a snippet.