Fixed references. Added option policies to table.