Added filter modules and changes to event detection