First fixes. Adding some new configuration