Task 3227: Adding Global and Config - Work in progress