Update to use Linkable module