Various changes to support a more dynamic configuration.