Updating SDK and fixing tokenization