Add more global vars
Merge branch 'define-as-global'