Bug 977507 - Add support for configuration files