Enh: improved statements configuration