Restructured to use shared global configuration