Added sql tokens support