Re-added config handler