Update to configuration logic