Code cleanup - Further dynamic configuration