Redo linking to be similar to the PostgreSQL plugin