Polish CS API revamp

https://issues.jboss.org/browse/ISPN-3478