Updated the configuration support to be more generic.