Added PolicyGenerator; Fixed bug in tdata.