Adding support for globals