Refactored Event filters and callbacks.