Remove Hardcoding from Global