Added more configuration parameters and configuration file support