Moved identifier_table to separate file