ISPN-3478 Polish CS API revamp

* updated after review