Updated to internal config structure capable of scoping