Add opt_label table and change scripts