Added Leonidtok support