Configuration no longer hardcoded