Add new mechanisms to common/tok_spec_struct.h and tok_specific.h