Enh: worked on improvement of statements configuration (nearly completed)