added variable support