Adding some modifications to FST class