Added custom variable support (for globals)