JC: added features handling subaction. More spec. More CN.