Added configuration-block and fixed indenting