Added separate config context stack