Add better variable support