Config files support added