Remove encoding declaration
Add configuration block pattern