adding globals support