Modifications to support the move to config.