Updated configuration handling.