Simplified and atomic listener handling