Troubleshooting and Configuration Refactor