Added variable support at API