Token security update and removed dereference_list