Added Constant/Variable Scope