p06 added suffix support