Migrate to :global-vars