Add link extraction and stop mechanism