refactoring on signal-receiver schema