Add tinkerer support.