Added extended configuration file support