Added variable support