Added global envelope/lockbox tracking