Add Listener options and filtering hooks