Configuration file support added