More modifications to FST class