Refactored signals signature