Added support for better config file