Refactored SignLink