Refactored signaller