Added configuration files support