Updated to work with new Thrift TokenList and Property classes