Added configuration and other stuff