Merge in config file support