Added SQL variable support